From 9b68ee30df359d7a85b5d31e1622c0190f239dd1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Thu, 23 Nov 2017 18:01:10 +0100 Subject: [PATCH] Fix build, links. --- babl/meson.build | 2 ++ meson.build | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/babl/meson.build b/babl/meson.build index 59cb88c..64bffdf 100644 --- a/babl/meson.build +++ b/babl/meson.build @@ -82,4 +82,6 @@ babl = library('babl', include_directories: [ rootInclude, bablBaseInclude], c_args: [ '-DLIBDIR="' + get_option('libdir') + '"', ], cpp_args: [ '-DLIBDIR="' + get_option('libdir') + '"', ], + link_with: [ babl_base, ], + dependencies: [ math, thread, dl, ], ) diff --git a/meson.build b/meson.build index 68aac9c..098e83e 100644 --- a/meson.build +++ b/meson.build @@ -116,8 +116,8 @@ platform_android = host_os.contains('android') path_sep = ( os_win32 ? ';' : ':' ) dirs_sep = ( os_win32 ? '\\' : '/' ) -conf.set('BABL_PATH_SEPARATOR', path_sep) -conf.set('BABL_DIR_SEPARATOR', dirs_sep) +conf.set('BABL_PATH_SEPARATOR', '\'' + path_sep + '\'') +conf.set_quoted('BABL_DIR_SEPARATOR', dirs_sep) ################################################################################ # Extra warnings @@ -218,6 +218,8 @@ else log = [] endif +dl = cc.find_library('dl') + pkgconfig.generate(filebase: 'babl', name: 'babl', -- 2.30.2